Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix up packaging of wapm on Windows #2007

Merged
merged 1 commit into from
Jan 11, 2021

Conversation

MarkMcCaskey
Copy link
Contributor

@MarkMcCaskey MarkMcCaskey commented Jan 11, 2021

It appears to work on Windows

resolves #1988, resolves half of #1971

Review

  • Add a short description of the the change to the CHANGELOG.md file

mkdir -p "package/bin"
ifneq ($(OS), Windows_NT)
if [ -d "wapm-cli" ]; then \
cp wapm-cli/target/release/wapm package/bin/ ;\
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to move this up too

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, got confused!

Copy link
Contributor Author

@MarkMcCaskey MarkMcCaskey Jan 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to but I couldn't get the ifneq working internally because the outer conditional was bash, so I settled to just duplicate it!

@MarkMcCaskey MarkMcCaskey force-pushed the fix/wapm-packaging-on-windows branch from 22b00c9 to 33d9f74 Compare January 11, 2021 23:00
@MarkMcCaskey
Copy link
Contributor Author

bors r+

@MarkMcCaskey MarkMcCaskey merged commit a8fda07 into master Jan 11, 2021
@bors bors bot deleted the fix/wapm-packaging-on-windows branch January 11, 2021 23:02
@MarkMcCaskey
Copy link
Contributor Author

bors r-

@bors
Copy link
Contributor

bors bot commented Jan 11, 2021

Canceled.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

WAPM is missing in installer for Windows
2 participants